projects
/
project
/
bcm63xx
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c286821
)
rockchip: pinctrl: rk3399: add the of-platdata support
author
Kever Yang
<
[email protected]
>
Mon, 13 Feb 2017 09:38:58 +0000
(17:38 +0800)
committer
Simon Glass
<
[email protected]
>
Thu, 16 Mar 2017 22:03:43 +0000
(16:03 -0600)
Do not use the API which of-platdata not support.
Signed-off-by: Kever Yang <
[email protected]
>
Reviewed-by: Simon Glass <
[email protected]
>
Added rockchip tag:
Signed-off-by: Simon Glass <
[email protected]
>
drivers/pinctrl/rockchip/pinctrl_rk3399.c
patch
|
blob
|
history
diff --git
a/drivers/pinctrl/rockchip/pinctrl_rk3399.c
b/drivers/pinctrl/rockchip/pinctrl_rk3399.c
index 6201603c5a3ff413c857c3777f7cbdc3a008f6f3..a74793aa485ecd16158a0ac0e79c5d8c35c3ed85 100644
(file)
--- a/
drivers/pinctrl/rockchip/pinctrl_rk3399.c
+++ b/
drivers/pinctrl/rockchip/pinctrl_rk3399.c
@@
-253,6
+253,7
@@
static int rk3399_pinctrl_request(struct udevice *dev, int func, int flags)
static int rk3399_pinctrl_get_periph_id(struct udevice *dev,
struct udevice *periph)
{
+#if !CONFIG_IS_ENABLED(OF_PLATDATA)
u32 cell[3];
int ret;
@@
-283,7
+284,7
@@
static int rk3399_pinctrl_get_periph_id(struct udevice *dev,
case 65:
return PERIPH_ID_SDMMC1;
}
-
+#endif
return -ENOENT;
}
@@
-328,6
+329,8
@@
U_BOOT_DRIVER(pinctrl_rk3399) = {
.of_match = rk3399_pinctrl_ids,
.priv_auto_alloc_size = sizeof(struct rk3399_pinctrl_priv),
.ops = &rk3399_pinctrl_ops,
+#if !CONFIG_IS_ENABLED(OF_PLATDATA)
.bind = dm_scan_fdt_dev,
+#endif
.probe = rk3399_pinctrl_probe,
};